Reconcile with jb-mr1-release - do not merge

Change-Id: Icd29eabf837375f635c5397491ccfbed124d8337