Merge "Add persistent property to disable strict mode" into ics-mr1