Merge "Use apex_available property" am: daa7cd7bcb am: fa4892ebc8

Change-Id: I34aba1794159013e5c170d7ace8ee5f1cccfe01e