Merge kitkat-mr1 into master