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

Change-Id: I0c176332db8359336defba0590598704d7b05179