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

- again rebased onto fixed test refactoring
- CQ doesn't need update since diff didn't change
- marked unclean IP due to CQ required