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

Change-Id: I4efdeba6449682016c643b70159594b9b5617533