Merge "add pii support for Rlog" into nyc-mr1-dev