Relanding "Set apex_available property" am: 5a2f33f999 am: f7fbbc73e1

Change-Id: Id8f6cac9bff272b5233f7994275d573c9706af37