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

Change-Id: I3440b2f2b43eb3d1327e5be5bd5108e23f166568