Reconcile with jb-mr1-release - do not merge

Change-Id: Idbd824035d7ad55843d56d085c0dc90553aa71ad