Patch Set 1:

OK, I've hope that my mentor has same attitude for this case as you ;)

So I'm switching to this task ;> first of all I'll merge it with current head, add Bug id and Change-Id to commit message and work on mentioned IndexOutOfBoundException