Merge "Fix up LocationRequest and ProviderRequest" into rvc-dev am: 240eaaaaab am: 293347f282 am: 76dbf6f6a8 am: e9ced9c212

Change-Id: I5fed49a544129ce8cd9e28d7a0ab4284ac6c0e09