Merge \\\"Update battery content descriptions with labels\\\" into nyc-dev am: 2a6b3d4db1 am: a996a46c62
am: 05c7b5ad89

Change-Id: I5e8a2a397f721b2bb5f572a13da88e0e6df333dc