Merge "Chaser patch for AppOps restriction changes." into nyc-dev am: 82746b0
am: b9baa8a

* commit 'b9baa8aada4369ba35db6cd0e19224285786a9e8':
  Chaser patch for AppOps restriction changes.