Update for 4.4 compatibility

Change-Id: Icacb03ac15601a625cdc7e0e95db11f9b9189c7f