Reconcile with jb-mr1-release - do not merge

Change-Id: Ic30692b569b80fb34ed2d2960007f76b01e0c398