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

Change-Id: Ie4f29093944bea7faa6eb3b3afaf098336c761ba