Merge changes I7328f304,Id3a3d0b2 into stage-aosp-master

* changes:
  Adjusts the USAP pool refill mechanism.
  Change USAP name to application name as soon as possible.