Merge "Bump api to 2.4.4" into honolulu