Merge commit '4.4.1_r1' into HEAD

Change-Id: I00cb131aed659de73cb1e3d3e9fb7a67fc2505a3