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

Change-Id: Ifa36a12171a95a8c67240ba55ed6b682a045a3e8