Merge changes I4fd5e3bd,I4d2994d5 am: abc8344cc1

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

Change-Id: I570d6ef985fd71aa635ff994270d03d6244d1f3c