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

Change-Id: I5bdce8b1103c970fd515028e48336fc26b9f2fbd