Vladimir Matveev 7d2ce0f5c1 fix falling tests and linter issues
(cherry picked from commit 7404b901b962d0673b7d4522cd961c3dd8859e9b)
2016-02-11 14:23:01 -08:00
..
2016-02-11 14:23:01 -08:00