Merge "Change field type for reverse" into rvc-dev am: 4b1af29149 am: db69dbc5ff am: b05771f2a9 am: 25bdb7075e

Change-Id: Ie4c856cd4eb5aab8eea88f1365619cc549b8dbfb