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

* commit '7095f876565f8c52bafe02e7c6ba04aa0c274dfa':
  Whitelist getTimestamp from integer sanitization