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

Change-Id: I03093891a09e5cee2fee0838930b0578d31bb5fa