Merge "Merge "Fix emulator GPS support"" into tools_r7