This reverts commit cb74c08979. Reason for revert: This change is not a cause of b/342557183 Change-Id: Iee8d9b05bbe130a46b627b12da525177b4ee89b2
cb74c08979