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

Change-Id: Id5e1f6184de563b51fcd185fb2768c648f788ff9