Use apex_available property am: 26a3ecbc0b am: 7e038382e6 am: fc4aae5c1e

Change-Id: I3cf742c26aea79e3bb27a3057417e972e972d740