Merge "Add audioserver UID." am: c57c622e76
am: 9369c5760f

* commit '9369c5760f41c1bb7e9ee273e1d5f361fceb4a44':
  Add audioserver UID.