Aligment of label texts to support buttons am: 3fb01037f5 am: 2a488d3c55

Change-Id: I652303bc887f16e9979e71ef1c1d1999146f23d5