6.0.4.4

Change-Id: Ia6a077ea71d9f03e90e039ce28eebe26d28a221f
merge CyanogenMod

Change-Id: Ibf571acd5106f7411c9ae91cfb83c7db0bf5d29d