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

Change-Id: Id21c5cc3e276166c24009244a452f268fd64571e