Reconcile with jb-mr1-release - do not merge

Change-Id: Ib9d575cce6450d7d9b4df6fb731f7618192c2858