HYGIENE: Removing FIXME that has been fixed.

Change-Id: Id74a73df8f347f08e7986a9e31c8e35d399851c4
Merge "HYGIENE: Removing FIXME that has been fixed."