Merge changes from topic 'API renaming'

* changes:
  Worked around the crash caused by API renaming
  Rename Gps to Gnss for measurement-related APIs