Merge "Stop hard coding gmock things." am: 8bc59ec625
am: 0767b6f63c

Change-Id: I4754f65d4ef721b5ea8c63f3b1b8c95518877aa2