Merge "Suppress existing CallbackMethodName lint"