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

Change-Id: I9855d7d255e8180992e55f8695439a1463b51f00