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