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: I97f1ba219f23b509c62c22f4a2786e4fb13b530f
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: I97f1ba219f23b509c62c22f4a2786e4fb13b530f