Replace error and tracing logs with standard log messages am: 6767aec6e6 am: 120e003830
am: b7c20b1e0c

Change-Id: I2a0d084d09f4a9216ed7c92d50c5125d00bf5724