Merge commit '4.4.1_r1' into HEAD

Change-Id: Ib9992731a050b687730b3fd401f3d416f548c9eb