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