Merge "Avoid leaking property values into logs on error"
am: 21aa749ec7

Change-Id: Icded1f49f819b4df4c47e088ed6f40f43e79e02d