Reconcile with jb-mr1-release - do not merge

Change-Id: I0c361b5f1fde8ab48360efa3a06ab7d2ccb88370