Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
am: 3e5318496e

Change-Id: I6060ae5a113025b0cfbbd8ff1f58599cb8f4cf7e