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

* commit 'b591640f590b9ba133d1cae37aba038d1f9d4a86':
  Adjust a variable type conversion.