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

Change-Id: I50d7a0cbc6632c78a725810d960e049c310b3597