Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I8cf874e3cc6c6fff940da7b8954ae50eb6f5e10d