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

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