Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread