Merge changes from topics "presubmit-am-18cfee8fd4a246488709515ab35ce4dd", "presubmit-am-909842e21190489984382774e830cfd7" into tm-dev

* changes:
  Use Owners in PolicyVersionUpgrader
  Extract OwnersData from Owners.