Merge "Add key for sample rate and bits per sample" am: f7c4c728fc
am: f4f1adbf8f

Change-Id: I64ceb88b1d7b40e8019fb11ce47307cf7c18df65