Merge branch 'kk' into kk
Merge pull request #1 from AOSPUI/master

Merge branch 'kk' into kk