Reconcile with jb-mr1-release - do not merge

Change-Id: Idbfc92bb061e8331db8daa2a8a61efc6d7a1cee6