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

Change-Id: Ic15054f8edfa0d99b6e42650fa44c9dd2000d75b