"Adjust margins" into kitkat

Change-Id: Ia1bac7dabc2812458472cb25dd01365092d1b53b