Merge "Fix ArrayIndexOutOfBoundsException on initial commits" into stable-2.8