Reconcile with jb-mr1-release - do not merge

Change-Id: I07e84f6c8bf9dd462eaf105d9dc663276cc1aa60