Reconcile with jb-mr1-release - do not merge

Change-Id: I3613cb7a8d96bd334e213ca318b5e121cbefbd48