Reconcile with jb-mr1-release - do not merge

Change-Id: I7faf49ef059f0f01586b3451426ee59d5778a25f