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

Change-Id: I1119d8ad237c83d9ad30d8a175e117131f63f54b