Merge "Set apex_available property" am: 330ef560a5

Change-Id: I70fb387aa9bf56c2c4adc8eb3483e82134942991