[TASK] Simplify File Upload API

Change-Id: Ieb42e0ce5c3f12ec94b5d4426e1e3480705a8a5e