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

Change-Id: I0db66ed691aacde359a59d04f886ee9274a1d01c