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

Change-Id: Iad1e7b1a8a2616ce321d8cae69f24e2fa3fc83c1