Freeze for real now

Change-Id: I4fa2e488e2bda134877893f4109af4c2d40a60ef
Merge branch 'upstream/kk4.4'