Reconcile with jb-mr1-release - do not merge

Change-Id: I91469c571a771a8531dfe3071b739a5d8e18c724