This reverts commit 5ad9ca63. Reason for revert: Likely culprit of b/264418864 Change-Id: Ibf1dba56577561bf3b1455e8a52a630949f0a3cf