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

Change-Id: I1150c75745fd1fd206e0f823635dbdf20828de50