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

Change-Id: I49e0d5ec63fca56395fee5463633c21cff73f06d