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

This reverts commit 814178ff90b77d31ace739f6a1ec95d7065de37e.
Rebase from 'upstream'
Trimmed the branch to only the image_common sub directory