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

Change-Id: If429c8987bdda6ade37364cc116ff0fcd01315a2