am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException

* commit '71fb8af7c55f6821bf190261e29728e51e895266':