More cleanup for changes to the way readers and writers are made available.

Change-Id: Icf6f5546f3ffc340277736982fc3ccbd01f7cad2
Merge topic 'serverside_only_reader' into next

37ce4c9 More cleanup for changes to the way readers and writers are made available.