Merge "Using ::testing::DoAll" am: 036b111df5
am: 7e11f72de3

Change-Id: I303ecfe6443923f2b6668cfa831d747b2482b31a