Merge "Update GNSS S2R APIs based on API Council feedback."