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

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