Merge \\\"Don\\\'t send user to permissions screen if none requested\\\" into...
Merge \\\"Don\\\'t send user to permissions screen if none requested\\\" into nyc-dev am: 3e531849 am: 650cc723
am: 1fb5f435
Change-Id: I53ff5a78a82154b75650e1b00bd389facfb5ca52