Reconcile with jb-mr1-release - do not merge

Change-Id: Ia1e6413d3d45634a4b91dc8a528c991a05ec3627