GitLab

Fix some (note the fun infinite recursion bug from the dawn of time,
apparently no one has called that function), silence those that are
style choices.

Bug: http://b/26936282
Change-Id: I99fa342abf9d134fb729ed8d906e60c011120e89