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

Change-Id: I326134006fecbdae67d1032dfd8b1f60bc5ab808