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

Change-Id: I32891bfbd2363343f1b4c65baf43f46e3fd4092e