Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause"
am: 15ddba32e0

Change-Id: Iaf41586e1eb679a003ba4fc52c4413617c71e7a7