Merge "Don\'t throw runtime exceptions for permission flags" into nyc-dev
am: 01da140ace

* commit '01da140aced14162d6d1bf4a0b2bf33e23b9c2c4':
  Don't throw runtime exceptions for permission flags

Change-Id: I5add764e1665c24e54bc3d461ef0ad8ca6c880a0