Added auth_uri to a few more places, as requested by havana.

Change-Id: Id54e2bff9fb7733a06cc06ecc66aa446af0401f7
Merge "Added auth_uri to a few more places, as requested by havana." into production