Set apex_available property am: ed96332532 am: efab765246

Change-Id: I4a32a2d6cab8c7c9a57db2921f13462d859e6dc5