Merge "Update design to fix non-protected broadcast from system issue"