Merge "Make systemTime() abort on bad input." am: 49cd73754e

Change-Id: If0fe073f61a54a04abf8bb8f8d6a71bbaad204c4