Reconcile with jb-mr1-release - do not merge

Change-Id: Ieb5a478a87c7f3a3bb38e588c92e6768c047bb29