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

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