Merge "Fix up LocationRequest and ProviderRequest" into rvc-dev am: 240eaaaaab am: 293347f282 am: 14f734fbed

Change-Id: I1eb6c67f77c78538221f2d58ed9976e6a9b332fe