Merge "Remove even more unnecessary flag" into ics-mr1