Patch Set 1: (5 inline comments)

I screwed up a bit with Patch Sets but the last one seems fine.

I committed fixes as separate commit with same Change-Id on my fix branch. Then rebased it on top of the most recent changes from upstream. Then pushed to gerrit. For some reason only first commit from my branch was recognized that's why my second Patch Set looks exactly as first. The third patch set is the result of soft reset and ammend of my fixes from second commit into third. I hope this won't affect merging of my changes.