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: Ifb8b333ff367cbcd24333e3b46aa060060b384ed