6.0.4.4

Change-Id: Ia6a077ea71d9f03e90e039ce28eebe26d28a221f