Merge "Updating user restrictions when they are removed" into nyc-dev
am: 1893c4cea7

* commit '1893c4cea7825e9f44f08b6165a04fd90c1adf9d':
  Updating user restrictions when they are removed

Change-Id: Iccd07150139f025fa16b74eee2670252b6c17a3d