Merge "Make buttons of bottom bars match spec." into arc-apps
am: 31018c2e4c

Change-Id: Icdb7ea92a19f1a58dd47ca84ec929c44030c2ef9