Add timestamp, atomic counter test and test for corner cases
am: 0ad9a99894

Change-Id: I24211105285b5fc3cb050129847ef7d463f92747