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

Change-Id: If94bc1b3dd0ed5ad697656303ca434152b4a5b18