Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585
am: b6ae32162e

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