Merge "Address API review comments for registerReceiver" into oc-dev