Don't use bogus nonefm format

Bug: 57504
Change-Id: I3ecd8a0aea6908f6401430e889b1b9904cbbe672
Merge "Don't use bogus nonefm format"