Paddings approved by allysont@ for preview build. Bug: 15540707 Change-Id: If7288d032b9625e0fbb5b657afcf680d178e63ee