Merge "Change the variable name "buffer_state_bit" into "client_state_mask"."