AIO change vars to defaults

Change-Id: I5a7f74d30ad419e4a0fb2685b10a6ac5488aad45