Merge "Update battery content descriptions with labels" into nyc-dev