Merge "Define app-ops for new storage permissions in Q."