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

This reverts commit 56f12fa935e10d701d344a7bfa7e2d48bb5506fe.
Rebase from 'upstream' @ version '1.10.1'
Trimmed the branch to only the image_common sub directory