am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"

* commit '3f3ce8adc7a4fcb5ec23a317c8b5063b61ac15a2':
  Make SimpleSessionDescription locale safe