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

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