Working out the useless else disables (#526 from dseomn copybara)
Working out the useless else disables (#526 from dseomn copybara)

Project import generated by Copybara.
google/styleguide,theandrewdavis/cpplint,google/styleguide,google/styleguide,google/styleguide