Fix icon assignment problems.

Change-Id: I76c0de2962ab2b8fd224e68377eca9069eaa9ed6
Merge "Fix icon assignment problems." into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2