Merge \"hide PII from log\" into nyc-mr1-dev
fionaxu [Wed, 6 Jul 2016 23:22:26 +0000 (23:22 +0000)]
am: e4344cd61e

Change-Id: If980329bf58064f6c7b689bb995d7f648c69ef1a


Trivial merge