Merge "added explicit sqrtf to the float version of norm" into release-4-6