Track 4.4.4_r1

Change-Id: I96aa40a8f420390dd0e44a34e7edac489ad9e3e5