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

Change-Id: I24ccd42ff2078ffac5560a132dcd2432118f6788