am 1cd70006: Merge "Adjust a variable type conversion."

* commit '1cd70006b3314ed7234f613092ccc5ac8f610dac':
  Adjust a variable type conversion.