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

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