aio lab fixes

Change-Id: I6df3de6d0510cabb74b43ec727eea777290942a0
6 files changed