Bug: 76226464 Test doesn't work. This reverts commit b9ad26d1. Change-Id: I3bdb60981e0e37457686cf9aeefb0f1103d485a0