Merge changes I65063e1f,I9090720f

* changes:
  Update libgsm to patchlevel 17.
  Update libgsm to patchlevel 16.