Merge "Align bottom text with battery graph in RTL layout." into nyc-mr1-dev