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

Change-Id: Iaffda05bc8f285a7b4fdb8477608f228a42733f6