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