Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7
am: ae8b7259f5
* commit 'ae8b7259f59eb3208517f6e3558b9ba991f39b96':
Change-Id: Iebc60c74712a3d1b259f7d10d68aee850be79cc5
This commit is contained in: