Merge "cpplint: Cleanup errors"
am: bda66c79fa

Change-Id: I47b276c14e5ae8c3cad49b854cedac7c8fbed740