Reconcile with jb-mr1-release - do not merge

Change-Id: I2574f76e658ad480d22c600a6e1e4f7b251a1749