Merge "Set apex_available property" am: 2401f5f2cc am: bacaf76c0e

Change-Id: I86d74a6603acf59fadb16d7d16831b12ec5a2c83