Rebase due to changes in 4.4.3_r1.1