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

Change-Id: Idac3a70dc9c8a10e82076014078d7b5af3acac72