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

Change-Id: If83696671a05cf7bf34655b88b08e8b6d08570ac