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

Change-Id: I3add5fe5dca70812b424e80e2e154d9af4d5011a