Merge "Return bits per sample and sample rate as metadata"
am: 814b68373d

Change-Id: I756577aaec5981ee15b73e8275fa31d106bbb4ec