i -> I

Change-Id: I4b6971147e773d3f203a8bbd82d54f4d521bdba7
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1