Update for 4.4 compatibility

Change-Id: I4478a4eb5bf16db8c94905e25399a877bb7da1d0