Fix broken tests

Test: All pass.
Bug: 34882474
Change-Id: I9f374dd3297f536863e519715655e50fb21dbe8d
4 files changed