Merge "Update padding for emergency dialpad buttons" am: 92702d3799 am: 07aaecccba am: 525c270ee9

Change-Id: Ic1e1a959b7998d08d1a337e394c0e08459692ab3