This reverts commit 943c8287. Reason for revert: Possible root cause for b/210934408 Change-Id: I1ad30012d062342f21752fcc763e7973d1d1a118