make it candy

Change-Id: Ie06f688d38d3f2b3b290d21351c39e247ae76096