Add FIXMES to Zero code

Change-Id: Iae196225c5da00b95af70f0f7afdd4fd6d5ea286
Merge "Add FIXMES to Zero code"