Merge "Make FLAG_AUTO_CORRECTION public" into ics-mr1