Merge "Merge "Fix wrong parameter fieldIndex caused IndexOutOfBoundsException" into rvc-dev am: 599d3497 am: 3c011b27 am: dd7e1bca" into rvc-qpr-dev-plus-aosp