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

This reverts commit dc47a5c136ed1371d80884d96cea46013b29de3e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the image_branding sub directory