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

Change-Id: I5291dad7300d33cff9e7fc8ae1aa49306125c6dc