Merge "Set apex_available property" am: b406598566

Change-Id: If3b50791a7e3ab77bc100c7c16c856bc246990bb