Merge remote-tracking branch 'SOAP/kitkat-mr2-release' into kitkat