Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585 am: b6ae32162e am: 32a7d85f64
am: 28c7363e8d  -s ours

* commit '28c7363e8dd7c85606a1e336710aa51963f1d174':
  DO NOT MERGE. Cherrypick UiBench from Master