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

Change-Id: Ief303163dea66f6e113bc82c6e262e6d25c65162