Merge "iorap: Remove blank newline in TEST_MAPPING" am: 22fe21df93 am: cbe655e781
am: d40cb164d5

Change-Id: I6637b6233ce90ec19437465050394232731540bb