Merge "Fix build with new googletest" am: 44bc03af44
am: bdebd1cb3d

Change-Id: Ia4b31ac204db46b6af7e9b3a8c1e785e7423e1f2