am 699b88fa: am 6c10aff9: Merge "Fix crash in SipUtil" into lmp-dev

* commit '699b88fa05b24882f7986c6cf158aa7b70dd917c':
  Fix crash in SipUtil