Merge "Change field type for reverse" into rvc-dev am: 4b1af291 am: 8b803c20 am: cc788d98 am: a4d354d6 Change-Id: I6843be9e5f02c9ac981969840d6f20247ff7354f