Reverting due to gtest crashes. This reverts commit 3a3e4c10. Change-Id: I7e1adf0d886a1cdaf3152469b3c11a33131ee498