fireball nighties compatibility

Change-Id: I474d9e01397309407462a0c3ac6750901f010081