[automerger skipped] Set apex_available property am: 06d7695f0f am: 80d4dd833d -s ours am: 11d1df0c5d -s ours

am skip reason: Change-Id I0b986f05fb2b4391625c596d38f351d5963bd0f7 with SHA-1 06d7695f0f is in history

Change-Id: I5874556ab7cd6dce8fe3ad4bfa3da40fe2104d55