Merge "Update 4.4 to 5295618"