Merge \\"Add ioprio values directly.\\" am: feabb0fdc1
am: 93e00be7cc

Change-Id: If691edc8511ebf71babf0874d6c12a16b29b23e3