Fixes cpplint errors, over the shoulder review by @larkost
Fix #3173.
Merge branch 'next' into sam_2134_iii