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

Change-Id: Icc244088e7c6ce46c8b5a08fea10ba12a82b3171