Reconcile with jb-mr1-release - do not merge

Change-Id: I3295bdb670882ec455141c50d2c3f71dab97af67