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

Change-Id: I63be2daefedb42f79fa04db65b63bddedda3fd25