Merge "Redact privacy sensitive info from logcat" into sc-dev