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

Change-Id: Ic86ea3815748a11695d10b369d957ebdf647ab57