Merge "Change field type for reverse" into rvc-dev am: 4b1af29149

Change-Id: I5b83a8e378ea3c37f578ac53f13f0da1ac15c1a2