More 4.4 updates

Change-Id: Iae9c73bba0313fee8c02dec74dcc126175dc39b9