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

Change-Id: I4dd275dc4f27f8f216d7ba29748466c407650b6c