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

Change-Id: I1919ee28071c2281896a2f7fbb3d6aadf4f47cae