fs: Fix -Wmaybe-uninitialized

Change-Id: I46e65c678d03d72531729f5423f8fe51da716029
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0