Removing temporary workarounds to make tests pass on Cuttlefish

Bug: 136278866
Change-Id: Ie537a578bb871921c0cbea1f197261e703de98f5
2 files changed