Reconcile with jb-mr1-release - do not merge

Change-Id: Iab14a842fc3560919dbbb16a7cc891acd9b6f529