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

Change-Id: I2f44e5d059ca2d6cb1f96ef628cf112ace247f70