Merge "Flag storage settings cache invalidation time." into oc-mr1-dev
am: b53b925f68

Change-Id: Ib6706048900ee19a72ad412da091a9278adb42c5