Update for 4.4 support

Change-Id: I0ba25badcc8823f55c87c19a92b094cb233cb1a2