Merge "Merge "Fix battery percent text not updating on Font size change" into...
Merge "Merge "Fix battery percent text not updating on Font size change" into oc-dev am: 2ca91661" into oc-dr1-dev am: 4fb00186
am: f6febf77
Change-Id: I4bbdf03ddcb01ba427e72d5a6ca55fdd4b01cd63