(cherry pick of commit 05383ebf) Bug: 17298769 Change-Id: I1994ff9f9da9b13249099f6c9bcec88dcdc2bb97
Attach a file by drag & drop or click to upload
