Merge commit '7522cac555bd8010d6603cfe0ad831a6f1c1af4f' * commit '7522cac555bd8010d6603cfe0ad831a6f1c1af4f': Fix typo in GPS mode logic.
Merge commit '7522cac555bd8010d6603cfe0ad831a6f1c1af4f' * commit '7522cac555bd8010d6603cfe0ad831a6f1c1af4f': Fix typo in GPS mode logic.