Merge "Change field type for reverse" into rvc-dev am: 2d15283def

Change-Id: Ie7984a47e42e3a61b1c4b9285cab2832e2779ae9