Merge "Harden monitor tests against spurious wakeups."
am: aee9eafcb6

Change-Id: Idf2de81406a2357802e92e9f188159ec56424cb5