Reconcile with jb-mr1-release - do not merge

Change-Id: Idb6548913ea9c4fc31a5b79e889274e7689f52c0