Merge "Update broadcast with correct extra field"