Reconcile with jb-mr1-release - do not merge

Change-Id: I5103348a4d9516d799377625c905fac66c9c9837