Top SQL rollback

Change-Id: I19bf3b1a49358d4203aa921c200f9ef9fc21afdf
WaitAnalysis improvements

Change-Id: I632b4d89d2c550a02606014304ede2d715448bbe