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