Reconcile with jb-mr1-release - do not merge

Change-Id: I6b2bad1e7cea1d3ec0c2c98169e968e4c54be08a