Bug 880931 - Recover cpu wake lock
Merge pull request #10529 from alivedise/bugzilla/880931_master/recover-cpu-wake-lock

Bug 880931 - Recover cpu wake lock, r=timdream, a=leo+