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