Backported r3p2-01rel1 API 20 driver patch