Merge "Add samplerate and bitspersample keys" am: 25b0f8dc2a am: 69b22687b8
am: 842c1a748d

Change-Id: Id52dab8294a5bc3a8c4187688e0fe1719df585fa