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

Change-Id: Ife2fbeedd35a7772ff27b97ad86f5686b68443f6