am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev

* commit '872965bb22ba74a06b755547883c5d0de62bb956':
  Use a consistent policy for filtering wake keys.