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

Change-Id: Ia95ceb234c77dafcedb79274226f4bd279c63c79