Merge "Add image strings to intern table" into lmp-mr1-dev