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

Change-Id: I2310771930b38171131df85b0bde4fdcf64b5030