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

Change-Id: I85ab984608ef94e167e46c34af012d0f2e838007