FM: Fix KW issues.

Fix KW issues raised on treble builds.

Change-Id: Ic584f20d3348484e37bc261f34cbbbd366e7f280
1 file changed