am 355c04df: am 79724856: Merge "warnings be gone (2/4)"

* commit '355c04dfe84b06311bdb15a1617e22bea4eb2571':
  warnings be gone (2/4)