This reverts commit df29c42108. Reason for revert: b/372348308 Change-Id: Ib87b0f3045f9962a3cc0bf725cf535a3409fe5bd
df29c42108