Set apex_available property am: ed96332532 am: efab765246

Change-Id: Ic3b550b21f90c4b3d2a8f66ce28a52be93430969