Reconcile with jb-mr1-release - do not merge

Change-Id: Ic5f4d5010eedb666a8881982067b136cdc220fa7