am a2f5ed7f: am 4dffe462: am 22057e06: am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev

* commit 'a2f5ed7f815a1d2118a1d730578222e05394e79d':
  Improve getTimestamp documentation