Patch Set 6: Looks good to me, approved; Unclean IP, do not check in

Code is good but this now needs a CQ.  I missed the size of the patch before (its 627 insertions(+), 67 deletions(-)) and submitted it too early.  So its backed out and is now pending as CQ 4419.