Merge "Renamed getTimeStamp to getTimestampMillis and added docs."