Merge "Make battery labels translatable." into nyc-dev