import: v3.17-rc2-r48 (linux-dev)

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>