DO NOT MERGE Register OnHoldTone event am: 7a65cb2  -s ours am: 35be91d
am: 5f265ca  -s ours

* commit '5f265ca961deb4acd1425e02b9310f4a336fac2c':
  DO NOT MERGE Register OnHoldTone event