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