Merge "Omit RC_EXTERNAL edits from UDP feed"