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

Change-Id: Icc36d68d220e04e79d7553ca724d3c021f24c2b1