Merge \\"libutils/Unicode.cpp: remove SafetyNet logging\\" into nyc-mr1-dev am: 98933455b5
am: 84de02d7e1

Change-Id: I17dc6f5ebf24827cc299e3becd6e2b6720a62f4d