Merge "hotspot2: hide Release 2 APIs" into oc-dev am: 39da850a95
am: 10da2c2d84

Change-Id: I0cad5713f1c272770edd1400d09259b8c3e9932a