Cherry-pick from master to fix b/6537483 Bug: 5686458 Change-Id: I9c5147446636d32bb3a420a05199870cca5f013d
Attach a file by drag & drop or click to upload
