Merge "Update for 4.0.4" into ics-mr1