Using ::testing::DoAll am: 87270fdd7e am: 958cd452d6
am: 029477c186

Change-Id: I7e30e5ef7fd53c6331f7f128764153bb14e0e3d4