am 0aeb0943: Merge "Ignore Wakelock Under-Locked Exception" into klp-dev

* commit '0aeb094381148a08ae05c805f1c91a5c6b6e4900':
  Ignore Wakelock Under-Locked Exception