Fixed the timestamp mismatching issue for 2 GTS cases. am: 9696c226d8
am: 1e083c95d5

Change-Id: I02f49d5b6c3266e85adfa820886d2b4cb70c5206