Merge "Change the service name of MSB register annotation"