Merge "Hotspot 2.0 - connect R1 used API to stateMachine(2/2)"