DO NOT MERGE: [CS] Remove timeout event after first available am: bf3b1bad15  -s ours
am: a8b73b23d6  -s ours

Change-Id: I61fbbf03bc011ae0b6b0e011bfb69dea33195c79