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

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