Merge "Make policy data enabled flag static." into ics-mr1