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

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

Change-Id: I0463116da229d2da751f52bd022d0c0bc60bef98