Reconcile with jb-mr1-release - do not merge

Change-Id: I4b74d2eaaf4c3d80493ae2f73ffde05bc9a0c381