Reconcile with jb-mr1-release - do not merge

Change-Id: Id17039f77e0e3a14fcca640bdeb65b24640b14b0