Merge "Set apex_available property" into rvc-dev am: 6e198f99e5

Change-Id: I76b3fb20d7d33b19d38c562709b4b4b62a402d65