Merge internal changes manually am: 08374c5630

Original change: https://android-review.googlesource.com/c/platform/test/mlts/benchmark/+/1449198

Change-Id: Iff96e0f28d994b82f21706f445d321318a58cb03