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

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