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

- rebased to current master and resolved conflict
- made comments javadoc comments

This change is waiting for approval of CQ4291