am 4255cbd1: am 8ef39424: Merge "Ignore another stupid lint warning."

* commit '4255cbd1754e5cfa3563ffc9a6eace631ec36ae3':
  Ignore another stupid lint warning.