Allow skipping timestamp check in certain debug conditions
am: 4ad3af6330

Change-Id: I425efb0779d694b2f2e5f124f48378c5c01e7de8