Reconcile with jb-mr1-release - do not merge

Change-Id: I29796fbc293247f4891a12b4277b33fcbe733312