run-test changes cause issues. Bug: 69591477 This reverts commit e9dc5249. Change-Id: I1ee05747cdc9292c6e1ce9f3ed8fc31a3d3fd6b8