Merge "Set apex_available property" into rvc-dev am: 0fd6dbaf22 am: 6cf416a7f6

Change-Id: Idf4ea2b49f69ff59f4c61c6f876f331691779c61