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

Change-Id: Ie79eb6a600bfb7dfc2da86bc2a07cd78add576e1