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

Change-Id: Ib873831d542e9e5cd9f76c38755563d0b54d0af9