Merge "Suppress lint warnings on google-default-arguments"
am: 31208f1b80

Change-Id: I6687007828a6ec4272821aab9403eba3e0822200