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