Merge "Use uint32_t for sample rate"