Merge "Check for spurious wake ups" am: 3a3cd0a27f
am: c2dcebe6e6

Change-Id: I6777a0845cbfbef3681e3f3779779c83001c0456