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

* commit 'a20e7d86ba94280422574596a6647f31e5bd2c53':
  Created 4 camera preview stress test cases.

Change-Id: Ifc9c7896c5131b524f9073d7316f95c0dc6106f2