add pii support for Rlog am: a7ab821aa1
am: d42fa0d7ec

Change-Id: I6d337cd7edecfdf24634ccb8d556de9f738935d7