Merge "Disable iorap test mapping"
am: 46b3d6d05d

Change-Id: Ic644f166fee8f74818e03b8ec72cbae1756795bf