Merge "Fixed button bar alignment issue in RTL languages" am: 403c8f72e3 am: 2063b1f792
am: bf62defed2

Change-Id: I7113cb185049848344c01b857e8a8646e9967432