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

Change-Id: Ic381b839fd0cde8e924aa967059cf7702dcaf17a