Merge "[automerger skipped] Merge "Moving shared classes to common.pip package 2/N" into udc-qpr-dev am: 183c5b024b am: 5759a63df0 -s ours" into main