am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"

* commit 'bf3e62b8913fc2fb88d6bb454a6491424cbd40c5':
  Make SimpleSessionDescription locale safe