Merge "2nd attempt to fix crash when getting unavailable service" am: ec4e0d3008 am: a9cb8d776b
am: c1968ab9a0

Change-Id: Id2a769571957c59a209263432256f77a190b68e0