Bug: 151764674 Bug: 33139050 Bug: 72461495 Test: sts-tradefed This reverts commit 84f78465. Change-Id: Ie00da129f00d698312aab5a79818be9bac013a92