Merge remote-tracking branch 'PA-base/kitkat' into kitkat-remix
Merge remote-tracking branch 'base/kitkat-remix' into remix-legacy