am 30981ed5: (-s ours) am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev

* commit '30981ed54fe3d0d926f236d97e101811fb40bb7c':