Merge "Include bot password app ID in audit data"