[automerger skipped] Set apex_available property am: 82947d327a -s ours am: 1d6ffcfede -s ours am: 7dd855e6bc -s ours

am skip reason: Change-Id I223a1c99ea9a46597041a7ec3f8e948abac9c964 with SHA-1 05a64f28ea is in history

Change-Id: I4c55a888a663bd00e393385811bccaf9e19e3c7f