Merge "Fail gracefully when IMS is not available"
am: dee32b721c

Change-Id: Idc6d95e5670c87979417d26e574fcdc55a671290