Reconcile with jb-mr1-release - do not merge

Change-Id: If8dd7e709eebee87512dbe33d7ed6858a7597593