Updating image creation to keep compatibility with some package changes.
Story: #2006752
Task: #37236
Change-Id: I23c8d14dce45d003fdfb58fed6591e937b27abab
(cherry picked from commit 2cf6806c18)
Updating image creation to keep compatibility with some package changes.
Story: #2006752
Task: #37236
Change-Id: I23c8d14dce45d003fdfb58fed6591e937b27abab
(cherry picked from commit 2cf6806c18)