Merge \\\\"Add ioprio values directly.\\\\" am: feabb0fdc1 am: 93e00be7cc am: 2e6ded2615
am: 95043fb374

Change-Id: I273f17940da48c31758b046b975409f811bf2b58