Merge "Cache storage values for fast loading." into oc-mr1-dev
am: 7fae6c67fb

Change-Id: I5e29852872dd08e0e5bb3f1822127879dc354319