Merge "Change field type for reverse" into rvc-dev am: 4b1af291 am: 8b803c20 am: 00a9c1e0 am: ddc1b072 Change-Id: I94a94c253fa239186eda4084e877ebf540f5b377