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

* commit 'cc08e619d6a946b58b2aae857e3190b5996c07b8':
  docs: platform updates for api 21