r950: updates 4.4

Change-Id: I2a8f608f883ceff66493c80405911bd8cdb1f51d