am 3d4a67d1: Address FIXME comments from previous cleanup CL

* commit '3d4a67d1ed392dd4788b84259d3d7ed7d694edf7':
  Address FIXME comments from previous cleanup CL