Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev
am: 2002061f34

* commit '2002061f349edfbf583b115af647f0ca34cf749e':
  Only reset global restriction owner on DO->PO for the right user

Change-Id: If1782d4b767ec46b14e8c1e31245fd9f99a93bf0