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

Change-Id: Ie39f191b994ebdf9ed19a919e54cf3e42e1d7774