Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am:...
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb5865 am: b6ae3216 am: 32a7d85f
am: 28c7363e -s ours
* commit '28c7363e':
DO NOT MERGE. Cherrypick UiBench from Master