Merge "Set apex_available property" am: 1ddfe48a9c

Change-Id: Id5b2b5d99ed792d1e36261c09370dc5cfce2b37d