Reconcile with jb-mr1-release - do not merge

Change-Id: I694692df8c4b28b047f7da606799687320474c99