Bring in Illusion stuff

Change-Id: If03e7ed5d305617f87c057fad70184015d6b5e63