Merge "RESTRICT AUTOMERGE: Fixed permission issue in car shell" into sc-v2-dev