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: Idc18b3531fda53257b85b81a869c00592eee83ce
(cherry picked from commit 0894ed72e71ef051a6a956f432069a60a063c559)
1 file changed
tree: 98382c2bb2a112d9063990f22660c78be20cfa86
  1. apex/