Merge "Replace kProducerStateBit with kFirstClientBitMask."