Merge "Use raw targetSDK for avoiding performance penalties" into main