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

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