Merge "Change field type for reverse" into rvc-dev am: 4b1af29149 am: 8b803c2054 am: cc788d984f am: a4d354d6b4

Change-Id: I6843be9e5f02c9ac981969840d6f20247ff7354f