[automerger skipped] Merge "Set apex_available property" am: 1fc074ee17 am: ecde95f0e8 -s ours am: 35751346f1 -s ours

am skip reason: Change-Id I7de3fe592959a752a75045fa675b871b7383b4cd with SHA-1 107a8b56b7 is in history

Change-Id: Ic5a696360ecf6629b1b6164ee5500e8f4ba01ae0