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

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