Merge "Set apex_available property" am: 747eb1a6b7

Change-Id: I136a937dd66191966450d3fa36a372ebb1850372