Merge "Register C2 HAL Service v1.0 instead v1.1"