Always show the battery percentage unless it is unknown am: 3f0250c3cc am: 44437259dd
am: 2f65bf3e37

Change-Id: Ie053342c9c4a02a1d8a40dc7295ae63fbb825323