Filesystem mount enhancements

Change-Id: Ia2990c9dadacaeef6adfbdc58424c327564bb663