am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
automerge: ee314cf

* commit 'ee314cfea558310a072658e2a12e951a365eaa9c':
  add tags for wakelock and other API names