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

Change-Id: If0f2bbab52fa0d4c4f1b49042deda6fe5722dc80