https://www.pivotaltracker.com/story/show/48342553
Merge branch 'dev_fam_child_icon_48342553' into develop