This reverts commit 81b228a5fb. Reason for revert: b/283523638 Change-Id: I2787b34e369ed2c879d80806bc30cab3dbb10c69
81b228a5fb