[automerger skipped] Merge "Fail gracefully when IMS is not available" am: dee32b721c am: c787160c91
am: b1838b3b82 -s ours
am skip reason: change_id Id37f4085f5de64d590168648c0e6bce60474c0fd with SHA1 9c0eb50e45 is in history

Change-Id: I2d57698e609fc44620f3aad25972b2ac1360c112