Merge "GPS Location Test Build Change"