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

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

Change-Id: I9c8f6138a25b231c804047241391e5bb9a50e9d3