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

Change-Id: I6ae43bec97caaad7e299500cb2caa0aebb33680f