Merge "Suppress lint warnings on google-default-arguments"