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

Change-Id: If0f05c6691840f3fb15baca7210a4ed7a91cc666