Merge "Remove unreachable code now that we no longer cache protected buffers" into sc-dev