Merge "Remove unnecessary flags" into ics-mr1