Merge "Define app-op controlling legacy storage behavior."