Cherry-pick I157164910f from Master. Bug: 11621857 Change-Id: I0fd0496e9091165280f34b4640ff0e524e3847b9
Attach a file by drag & drop or click to upload
