Merge "Fix build with new googletest" am: a7e5d5fd5b
am: 2fa0ae67f8

Change-Id: I2e04103fc6076790679d72564301db9ab27bead6