Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev