Merge "Fix wrong parameter fieldIndex caused IndexOutOfBoundsException" into rvc-dev am: 599d3497 am: e674a80f Change-Id: I597d7b27cc1b070eaa2151e4a30be4e4714f019d