Merge "Always use a positive value for timestamp"
am: bfe66d9800

Change-Id: I2ef63775a67e5d7810934025343e6cf5e7bb3aef