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

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