am cef1300e: am f3882914: Merge "Make policy data enabled flag static." into ics-mr1

* commit 'cef1300ebd6bc88e93ee1420e5fec359531533d2':
  Make policy data enabled flag static.