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

Change-Id: Ic8f7f714c30ef70172ebce8b6de7af8d09572eba