This reverts commit cb8b1082. Test: none Bug: 26366256 Bug: 72509001 Change-Id: I51a4f5ee5776e07ba2e2ee0ca9b2ff6c0c2e292b