Added FIXME to broken code

Change-Id: I04cb8c0c3362de03c6344e0c1e2a2b173dd35413
Merge "Added FIXME to broken code"