Reconcile with jb-mr1-release - do not merge

Change-Id: I9f43c1a10d1df3c9aa98d21d3dc8689da99fe1b8