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

Change-Id: I61b0a8bccd926cf3b5dfc7be4a16dbfe5878c8e0