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

* commit 'a0afc2111b30beb87fa5c73050a5ea7e56fdce1a':
  Updating user restrictions when they are removed

Change-Id: I75abe2a7aff6af02894b66f8fae255485f60570d