Reconcile with jb-mr1-release - do not merge

Change-Id: I2113e75ca4c91539da0c7bb6ed80d56b4ba91af7