Reconcile with jb-mr1-release - do not merge

Change-Id: I9545f52b76d36bfbdf29cd270d0af200cb2d51fe