Merge "Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec" into rvc-d1-dev-plus-aosp am: af5d4ff666
Change-Id: I5e8ec98b16871f6639784d7c8c86e86a427a758d
This commit is contained in: