Merge "Set Gutter on both sides by default" into pi-car-dev am: 20c44a35ce am: 9ad8f7df86 am: c26e319e86
am: b8119cd69b

Change-Id: Ib8b80f4d1fe71241d506a0fc9a3bf7c17207b2a8