AIO change vars to defaults

Change-Id: Ifbba5eae709bb6e79dc3ffcad82847e7662e9093