am 940ad4aa: Merge "Make AudioGroup.add locale safe"

* commit '940ad4aaef6ad27a2a214559100a18100b2b3b24':
  Make AudioGroup.add locale safe