Merge change 9524

* changes:
  Fix WPS Queued pip tone not working issue.