Reconcile with jb-mr1-release - do not merge

Change-Id: I35bc43d8273b7e5392a750112d8335005f25f493