This reverts commit 8a44bc95. Bug: 123870990 Test: no changes Change-Id: I725e83f2ecb3f3be5048cbb7580a4a26d5eeb9d5