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

Change-Id: I0ad19de3c7257a3de2856516cba132d8b7acb23b