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

* commit '356054d68b848ebc877cbff030b3598cd4242da7':
  Address FIXME comments from previous cleanup CL