Merge remote-tracking branch 'aicp/kitkat'
Merge remote-tracking branch 'origin/kitkat'