Merge "Adding GSI fstab entries when needed"