Merge "Always show the battery percentage unless it is unknown" into cw-f-dev
am: cd542213e8

Change-Id: Ia18309b80e0b628e2f1e2a08818195dc141ec5f5