Merge "Improve missing apex_available message" am: 4db3298d am: b0725e7d am: 2b31dbcc am: 98dbef82 Change-Id: Ib4a036d0dbca6e3df3f51b3a2d0f1d546b90f2df