Merge "Fix normalize and fast_normalize."