Merge "Remove debug log messages" into ics-mr1