Merge "Add missing "static"" into ics-mr1