These were always mounted, which is an anti-pattern. In order to get the podman deployment to work, these mounts need to be conditional. Change-Id: I5f649eea4e6c50905a333f231b49e91b8b5bef0d