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

Change-Id: I5cd5cb2e3e9a926bf332f20e396724c8155c3c6f