Merge "Fix non-dynamic fstab name." into master-cuttlefish-testing