Reconcile with jb-mr1-release - do not merge

Change-Id: I6b6342bf7e65019d9efeb2ff138ffb728bbef063