Add more specific sysfs labels.

Bug: 22032619
Change-Id: I0b8cd3587a9db95416ab6bda06976402b416ca78
8 files changed