Merge branch 'kk' of github.com:Plain-Andy/platform_manifest into kk