Merge "Add exceptions for patch 48515"