Merge "Fix broken target icon." into cm-10.2

Change-Id: I6e3b8d6f3131738e79fbacd41cf87b42a4999b1f