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

Change-Id: I6a2777a25426e69caf568c39823597c86aaa1c61