Merge "Cleanup unsupported appusage in Telecom apis." am: 90723afa47 am: 545bace60f
am: 77b1dfa56a

Change-Id: I54a446eaf8c22149f6df5c2f677eb8b5072deda6