Reconcile with jb-mr1-release - do not merge

Change-Id: I5bba3384a0cc6db0c4a2c358525dffa7f7704fcf