Reconcile with jb-mr1-release - do not merge

Change-Id: Icd6550119b70400d2bdd86b1176dcf88eed6aeca