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

Change-Id: If0fb97fcf33cb8b1b712238102d17f2c84c24f38