Merge "Fix item cache bug" into nyc-dev am: d3a7d47d00
am: 820f138418

* commit '820f1384189e4dc044899e9f95456b71460b4047':

Change-Id: Ib4d421170217e102910f98371b4a4a5956e388bf