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

Change-Id: I4d019e13e0d7bb5d7f1bada97bfa7948a1b650ac