Merge "Set enabledSurroundFormats as empty string when it is null." into pi-dev am: 66726f3609
am: 065423e5b3

Change-Id: I03213d3838cf603eec81d008de0f1f09c9a23772