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

This reverts commit 65c29b045b251aab9e5b72bca74bc93d9189b372.
Rebase from 'upstream' @ version '1.10.2'
Trimmed the branch to only the image_common sub directory