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

Change-Id: I92c6167d344897b27a891fa5c7c3f1d6c712e1e3