Clean up 4.4 merge

Change-Id: I326a2f3a488ec5883098b4f57c8f6acece2f607d