Image upload (PRD-2001)

Change-Id: I88c7a2900340e83d6751a2cfed537e6d544f5bf0
Merge "Image upload (PRD-2001)"