Merge "Update to reflect KKWT's graduation to API 20." into lmp-preview-dev