This reverts commit 232a0456. Reason for revert: Possible root cause for b/210934408 Change-Id: I9d36516d62cbe57ecda1ff2a53b972ec9206351b