Merge "Remove unused variable mount_point"