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

Change-Id: Ia029a261a4676efb3ccee849e4842c74b1e1f4b2