Merge "GenericSource: gracefully handle missing timestamp" into nyc-dev am: 8e4f62e
am: 3a84ca4

* commit '3a84ca40e933a8e82d4a9c75da4fba3338ec2acf':
  GenericSource: gracefully handle missing timestamp

Change-Id: Id97543fb2dc3c0722633d4d01c99459fb3173846