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