Reconcile with jb-mr1.1-release - do not merge

Change-Id: Id52b432c9ba02c838fbf4a80ae6353921ef035d3