This reverts commit 4273c18a. Bug: 243475788 Bug: 243490273 Change-Id: I5ea8c8e6a84408013bc7ed573776d8f5eebc091f