[automerger skipped] Merge "Set apex_available property" am: 678fe9907b am: b320dbbac4 -s ours

am skip reason: Change-Id Id68e7417f98307cbadea251f9e8a96b0697d8bec with SHA-1 c83537b439 is in history

Change-Id: I2a4892ab061db44032d6e2a22ecae48f66a6b3e9