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

Change-Id: I8a942298ac1cda479cbed919b0000e7d8bb55ec1