Address API council comments on location mode API council

- Start fixing b/10461763

Change-Id: Ic5305bdca38329765a1de565c0a25da12e8ab19d
3 files changed