Port from 4.4.1_r1 branch

Change-Id: I0791264e8371a3953ce375119ecee88b65d4d434