This reverts commit b35ab283b2. Bug: T265024 Bug: T262443 Change-Id: I65ddf30805ba8a2932af57ee28fc2c4700c3490f
b35ab283b2