Update images constants

*Update Messages to include import related messages

Change-Id: Ia3325b5d0c30ff6446c24cd42c6693d6664cd166
Merge "Update images constants"