Merge "Allow snippet able to install on legacy system from SDK 31" into udc-dev