FSR: fix assembly warnings
Merge "FSR: fix assembly warnings" into cm-10.1