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

Change-Id: Iba5303644b61747ed7e38e5bc0623728437e919a