Patch Set 1: No score

Good progress, a couple things that help...

1) missing Change-Id: in commit...
2) missing Bug: in commit...

Let's focus on small steps instead of a gigantic patch. We can always iterate.