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