Reconcile with jb-mr1-release - do not merge

Change-Id: I9083ad000467a93228455a796ffcd353f097a0d8