Merge "Always show the battery percentage unless it is unknown" into cw-f-dev...
Merge "Always show the battery percentage unless it is unknown" into cw-f-dev am: cd542213 am: f2fabc99
am: b0686f88
Change-Id: Ib137ee61cac29057cdeddbe1e45a01098ec6dfad