Bring up to 4.4

Change-Id: I9d69d497fbd0039d73e7127cea0660591e59e73b