Reconcile with jb-mr1-release - do not merge

Change-Id: I105d8e6a795dd5b38d42051196581896e7ea4f30