Merge "Fixing unused private field error"