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