Merge "DO NOT MERGE: disable iorap in q" into qt-dev
am: 263e639229

Change-Id: I068f564cbfb2cb9b8b635962a0025d2cd178adca