Merge "Fix issues found during CTS testing of FP16"