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

Change-Id: Ibbcb098a70e07a3fd2987cfc876fb2ff25592985