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

Change-Id: I2d0d8c3706d1e7516930d76d5b9a169b09cf5238