Merge "Change field type for reverse" into rvc-dev am: 4b1af29149 am: db69dbc5ff am: b05771f2a9

Change-Id: I758771108c8655205f1f4acdb94fe2afe0591ae6