This would allow someone to test its change with an AIO. Change-Id: I04be85fc69c8f6d0240ddebd93bb084e18019685