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

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