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

Change-Id: If091c4a00b32263691f4f0f28be6c58e53917715