This reverts commit 6b379cd7cf. Bug: 277162513 Test: Manual Change-Id: Iea61c06d328626a96c13c4c9f8a11f8329401b35
6b379cd7cf