am 7a432880: Address FIXME comments from previous cleanup CL

* commit '7a432880b9d42b91a7069c6fb5398470f3cff19e':
  Address FIXME comments from previous cleanup CL