Reconcile with jb-mr1-release - do not merge

Change-Id: If7c87d1cb0dc5bb52bb5a6e4b7fa8563c8e30694