0fdd43ab0d
This reverts commit 250f568cb2.
Reason for revert: b/186121207 should be fixed
Change-Id: Ia374d9ad251134979999d794331e3b375d183996