Merge "hotspot2: fix typo in the getter functions" am: d3146f3c3c am: 5644c190a0
am: 1b510ecff7

Change-Id: I56f99259149adb6a5e2fda7e2bbf8093a528a675