Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev