Merge "Suppress lint warnings on google-default-arguments" am: 32b3f60a7a am: 4845301874
am: a2aee8f91e

Change-Id: I85ba278be0425b44b7622ab1aef72c14e74eb4af