changes for Dirty Unicorns

Change-Id: Iaf3dd15392e764c1d1e0498cc37ec54508c52a54