Bug: 72379138 Test: sts-tradefed This reverts commit e9dcebaa. Change-Id: If77b1c29e94dabb82f025dc92c30f305eee13355