Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ibb842a678a67174de54e4174345379e67bc7bf8d