Merge "Add traces for otp redaction for apps" into main