Reconcile with jb-mr1-release - do not merge

Change-Id: Ia76fbf94fed108207ae3cb4d53f710f81aa4311f