Merge "rootdir: make sure the /odm mountpoint is always available"