Merge remote-tracking branch 'base/kitkat-remix' into kitkat-remix-test