Merge "Set apex_available property" into rvc-dev am: c6c000d1a5

Change-Id: I8df8a13c150c4a24264b89f8c327018789350c32