Reconcile with jb-mr1-release - do not merge

Change-Id: Ic3c4a57147bc3a4154c140beeeed27b5e3be9ece