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

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