Merge "Avoid get same timestamps in log testcase" am: 3f6b16395d
am: 9d4c75764d

Change-Id: I44349b43a2665b4aa1da2990d5b4369fce29ea80