Reconcile with jb-mr1-release - do not merge

Change-Id: I84f209a40227014231778a0b30a3d6a2c523e3e3