Use apex_available property
am: 1e88f980a8

Change-Id: I8eac170fab83294c6cd17166cda29b5e2a902700