Update illusion

Change-Id: Iacae80190472db1d9a0846be2d6e3841255110e1
Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>
Merge "Update illusion" into illusion-4.4