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

Change-Id: Ie4ab85823343fce20b8ad1c9ee08fbe99d83afd3