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