Patch Set 1: Looks good to me, approved; IP review completed

Looks good.

In the future, we should note that we should move to the Team API once it has new features that prevents us from duplicating code.