Reconcile with jb-mr1-release - do not merge

Change-Id: I86b0f44dc30be99464eb2a1d6891798cd1b14250