Lint cleanup.
Merge branch 'master' of ocprof:oc-cs170/breakout