Reconcile with jb-mr1-release - do not merge

Change-Id: I68b07c439ec2c5cb069ce492455ab161cb749e8a