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

This reverts commit c5f5396158330ab8bd4a81b75d26afc383db2e6d.
Rebase from 'upstream' @ version '1.10.3'
Trimmed the branch to only the image_common sub directory