Revert "Fixes for 10263198."

This reverts commit a77431219769cdfd724eef54b97b46d439cc9366.

BUG: 10263198

Change-Id: Iac4037bd30e8e5b4dadd0e618158e923eba38478
2 files changed