Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)" into ics-factoryrom