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

Change-Id: I94a94c253fa239186eda4084e877ebf540f5b377