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