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

Change-Id: Ia44e0e842899af19d551fc79a1527354f31036c9