Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev