[automerger skipped] Merge "Handle potential IllegalStateExceptions in Telecom." into rvc-dev am: 84782bda am: b30955ad -s ours
am skip reason: Change-Id I1705c44e93fe9cdf64feb78f307364f6ec098aad with SHA-1 b431b6be is in history
Change-Id: Icede595ec9e39e3425681ea8c2b84bb14d4a91ff