Re-commit flow, port statistics per code review

Change-Id: I26cd057e33ec37791cf58321b1e6921017e98bc8
Signed-off-by: Loi Pan <mr.loipan@gmail.com>
Merge "Re-commit flow, port statistics per code review"