[automerger skipped] Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause" am: 15ddba32e0 am: 510f917b94 am: 27b61580fe -s ours
am: 58e805cc00

Change-Id: I09e2d72d46a54b03083b17c30709065ecbccfff5