Merge "Add support for caching small reads."
am: e2e519ea2f

Change-Id: I641864dec2af82a74cb8680e30303e3338ec991a