Reconcile with jb-mr1-release - do not merge

Change-Id: I1bfc1867c44e5793876b1bd237b134cc8357e25a