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

Change-Id: I438a27c91b962170a3361d0fb9526730c7e586f8