Add FIXMEs

Based on PHP error logging and CR.

Change-Id: I4a260ab3cb4d30f8e8e121ccad9c51f5c3ab0bb7
Filter out some more git chattiness

Change-Id: Ia069ab211319ce60801cb041c83117fbfe549c6e
Merge changes Ia069ab21,I4a260ab3

* changes:
  Filter out some more git chattiness
  Add FIXMEs