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

Change-Id: I00c00d2cd1b51fb08b4a8ebc0ff0b17c99fa7b5d