This reverts commit d4ce0f3255. Reason for revert: Causes unrelated test failures, ideally usages are made safe before the patch is merged. Bug: T312838 Change-Id: I385dca1d95033961d3844e888521750443e49c95
d4ce0f3255