Merge "Bug 3330205 Remove unnecessary static variable"