And fix the code alignment in gtests. This reverts commit 7d32dbc0. Change-Id: I68813c36d1493f2746ceb129b30a649350d6bc13