Merge "Reland "Set apex_available property"" into rvc-dev