Merge "Split fstab mount into 2 phases"