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

* commit '7f2bbd3bbe2a7159854a8c037433b9ec4ad35ccb':
  Adjust a variable type conversion.