Merge "DO NOT MERGE: Fix a few issues with foreground service location accesses." into qt-dev
am: 80e9a4cc42

Change-Id: Iffa3ff2b6ab02eb9f7731285e9fd5e762b1c88dc