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: Ia28aa67a25fdcda1c8634e12cdba0eb6a338bf57
(cherry picked from commit c2368fcfdafd42dc6ab1fce5cdf7c2d0604884bb)
1 file changed