Implement completion counter

Change-Id: Id5f1542c9a0e96ed78fef1a82efceb98a9c9f28d
Merge "Implement completion counter"