import from sdk4.4_r1

origin/master@40e5e57