Reconcile with jb-mr1-release - do not merge

Change-Id: Ia1d2509ec937410d2bf6d6b1f81ddfca57d61567