Merge "Change field type for reverse" into rvc-dev am: 4b1af291 am: 8b803c20 am: 00a9c1e0 am: ddc1b072 am: 6f54d1de Change-Id: I1150c75745fd1fd206e0f823635dbdf20828de50