Merge "Remove declaration of unused static variable"