Merge "hotspot2: update method name for timestamp related APIs" into oc-dev