Merge "Add new shim that targets old dev sdk P" into rvc-dev