Merge "Fix wrong parameter fieldIndex caused IndexOutOfBoundsException" into rvc-dev am: 599d3497 am: 3c011b27 Change-Id: I89f22511ad22ac11155064314e2e8c07acb4eea4