Merge "Set apex_available property" am: fb0b0d24f2 am: d0d864deef

Change-Id: I34d549ca369020acf0939cdbf1cd64fb59a8f5ad