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

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