am 11fc651a: am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs automerge: cc08e61

* commit '11fc651aefbcdebc646f347e4981204d3ef7b0a7':
  docs: platform updates for api 21