Reconcile with jb-mr1-release - do not merge

Change-Id: I753a2c0b3bfb42c526b954e58d8874daf31420ed