apex_available becomes more correct am: 7c2f69e42e

Change-Id: I539575365d7b94beb8324788a4d731cb401ca54e