This reverts commit fdf4432356. Reason for revert: b/379796721 Change-Id: I34cdc69d5b8d11446da02106b7bd593a8c8151c3
fdf4432356