Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev