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

Change-Id: If6a7f8e7e734e9ae07e133093082eb34bbaf4aca