Also add descriptions because those are nice Change-Id: I2d0480acf17af2700c8b7fb7228203e16a068f6b
1a4527ce