This reverts commit d44b2931. Reason for revert: b/255986188 Change-Id: Ida999c15203b77aae1420be96dece22396c4ede1