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

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