Merge "Add support for manually set surround formats." into pi-dev
am: f824853eab

Change-Id: Id134ce99f99d0fa067a95ed5e2f109ec96c7cfbf