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

Change-Id: I96c58363303db1ac7fc6dfa43c3bd57c7f8ab734