Reconcile with jb-mr1-release - do not merge

Change-Id: I933866be4d956f18dff51676c8027f807cea26d7