Revert "Set apex_available property" am: 150e4b01b1

Change-Id: Ic57512597577d872ac739354552efae1917c80a2