Reconcile with jb-mr1-release - do not merge

Change-Id: I7cd153e8ccfb7d572a5796ca353ec9777de789d6