4.4 updates

Change-Id: I9e49bd1d74bb4d0ab195f35c822a86361984c726