Merge "Improve 1-letter variable names in MutableContext and implementations"