Merge "Remove m prefixes from private variables"