am 0d716597: am bd905403: am 3d4a67d1: Address FIXME comments from previous cleanup CL

* commit '0d7165970f3b561e1d6b275a3cbace59b577e19a':
  Address FIXME comments from previous cleanup CL