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

Change-Id: I7988a4a091c01ee427903c1926afcf5b2f65e911