Bug: 151764674 Bug: 34897036 Bug: 72459887 Test: sts-tradefed This reverts commit 7fa2fcb7. Change-Id: Ibcdaa562a027692a3e90b0ec5a0cdfc50b35453a