Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec am: f588353820
Change-Id: Id58ee8dd8be65bfa75fc7fe8e73bd71403da9d0d
This commit is contained in: