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: 09841419
am: f977f45a
Change-Id: I8268edc56031be3c04df10965d121ad6b79afede