Android l-preview release 2
am 141dd1b4: am 0aeb0943: Merge "Ignore Wakelock Under-Locked Exception" into klp-dev

* commit '141dd1b42c9b84035abccc99f85bdc93db359f62':
  Ignore Wakelock Under-Locked Exception