Merge "Add more mounting options to updater mount function." into rvc-dev