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

Change-Id: I9f04ac2bda5816997e86aa6aee683df3bbfcb74d