Merge "Add telecom test-commands for maintaining role overrides." am: d2d1a5a23e
am: eacfc9fd85

Change-Id: I131fbd59984aa825403a3c63add8b9a9b6c366d2