Merge changes I942f4451,Ic31c2afd am: d406ec6cbb

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

Change-Id: Ib5b66576a7a545764645d6e9b8cd21975b3d17d6