Merge "Add samplerate and bitspersample keys"