Merge "Use apex_available property" am: 16015ab09e am: b693c70430

Change-Id: I44f04ef47310571e94bb045cdd9bb4692e011fab