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

This reverts commit 3cec0c11bcfed3cc9342ed6214b76e9fd8fca593.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the image_common sub directory