Merge "Handle RS reflection name changes."