Merge "Remove hard-coded Object class from test 980" am: 4f6858cb8d
am: 5f5828791b

Change-Id: I3a7c61c580a650587bd8e02b4442a578ff2c593c