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

Change-Id: I8665d1cfdff8120168a135b95644d6f80ea48fb5