Revert submission

Reason for revert: This causes a boot issue on Taimen (b/144480969). It wasn't caught by TreeHugger due to Taimen tests being disabled due to a different lab outage (b/144350336).

Change-Id: I3374b4ede6fd1e64284bad78d3b6d3c520a73e63
(cherry picked from commit 4ccf5a2aa0899fc37fca2f8f1102e41a58815047)
1 file changed