Merge "Change field type for reverse" into rvc-dev am: 4b1af291 am: db69dbc5 am: b05771f2 am: 25bdb707 Change-Id: Ie4c856cd4eb5aab8eea88f1365619cc549b8dbfb