Hygiene: Kill FIXME

Change-Id: Ib1502797385ae01d924faf7d9ce12633d4ce9491
Merge "Hygiene: Kill FIXME"