4.4 changes

Change-Id: I77e9a16bb2cb92b8b1d29bdf089d21ab6ace2f54