5b845d2831
The revert was not supposed to be auto-merged. This reverts commit5a3bf93d82, reversing changes made to84f8002586. Bug: 331384026 Change-Id: Ieb11a8544db90259aae856c4af805c37ce9e68cc