Merge "Fix type conversion bug"
am: 31275df5ea

Change-Id: I4109d90280f901ad8343e95ea792302cd41cb8fc