Merge "Whitelist getTimestamp from integer sanitization" am: 51cd9a441e am: 7095f87656
am: bf24de292a

* commit 'bf24de292afd24c288e5522f1d0082c9fb7ec268':
  Whitelist getTimestamp from integer sanitization