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

* commit '5c518b7f01345a414cd260db7762bdb0aa73b55b':
  docs: platform updates for api 21