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

Change-Id: I2a69ed763c7b5f29c060d52b41897abd27bc740d