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

Change-Id: Ie62170e09a21633508ba86d2b211d7adb23f4038