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