Merge "Fix build with new googletest" am: 01a3f13452
am: affe5e1eed

Change-Id: Iaeb768a0031efbbd743630c112d24d0dc9f44544