Merge remote-tracking branch 'aospal/kitkat' into kitkat-sts