Merge "Fix incorrect left shifts."