am 49f6e970: am ff220f70: Merge "Remove a spurious FIXME and unnecessary type cast."

* commit '49f6e9706202b5caef3a68690153a96baa14cab1':
  Remove a spurious FIXME and unnecessary type cast.