Merge "Add const value for manually set surround formats." into pi-dev
am: 74961a7910

Change-Id: Ie8c58fbe3e70be6ab65f0f845833c12e48ecee42