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

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