Reconcile with jb-mr1-release - do not merge

Change-Id: I198408ef678851f19476836b10a2fc002dd11a95