A couple more updates to 4.4 branches

Change-Id: I5aecfea04d27f4ca143fef1186d95c03f02eb411