Remove code handling null description and test class values

ag/26790840 should have resolved these issues

Bug: 300218473
Bug: 302018924
Change-Id: I1e97574efb234d92a27980e4f5481a85d7172b85
2 files changed