Reconcile with jb-mr1-release - do not merge

Change-Id: I7f624c73772f6ca57c25c119e7489eb161c71362