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

Change-Id: I669e34db64b8a34e009d51f494e20287288ee4e1