am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread

* commit '3f5995da76541443b7c071bd3acad7590ba222ec':
  DO NOT MERGE Add images to ERI icon list