Fix for Don't allow adding 64-bit files(4086708)

Change-Id: I880c89b565dd8172fdf077a514d5b3d03eab7d9e
4 files changed