Merge "[OOF] use non-root user to access cmso database"