Merge "Fix the bit-field related compile warnings"