Merge "Make the size of "cb_handle_t" same for 32/64-bit" into lmp-dev