Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev