Revert "Trimmed the branch to only the image_branding sub directory"

This reverts commit 738fbeb9c9fc6bcd034aedf66083c1ce0ba766a0.
Rebase from 'upstream'
Trimmed the branch to only the image_branding sub directory