Hack for aosp
Merge branch 'illusion' into HEAD