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

* commit 'a9681078cffd6079ce250a85757ceff783204d51':

Change-Id: Id5a3388ab3e045d65f26ab7327d6e45c5616a513