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

Change-Id: I92feb15daf759fb4f7c3f904d3afa70e0e809b76