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

Change-Id: I9201c90c03c6494428b399631ba61ebf3f3d6453