Reconcile with jb-mr1-release - do not merge

Change-Id: I77e76ba09125bdbd371933808a6399ab62372d8c