Merge "Reland "Set apex_available property"" into rvc-dev am: 83fda04e5a

Change-Id: If606168cd0065bb020ced2d063af769d205cd0f8