Reverting temporarily bypassed exceptions. Bug: 202110963 Test: Build Change-Id: Ib1a9d228a1d3d9864e03d3afa54cd85574ed8fe8