Merge "Follow-up CL after hard float changes."