Merge commit '10abe7f3e70fd9a54e20ec06ae0830a2a46bee50' * commit '10abe7f3e70fd9a54e20ec06ae0830a2a46bee50': Fix for 2137900: Be more conservative about poking the wakelock.
Merge commit '10abe7f3e70fd9a54e20ec06ae0830a2a46bee50' * commit '10abe7f3e70fd9a54e20ec06ae0830a2a46bee50': Fix for 2137900: Be more conservative about poking the wakelock.