Merge "fs_mgr: recognize a notrim mountpoint flag"